From 5545b07a5c5d9c842b39c4a9b6e561f37d7fcbb4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 7 Sep 2010 18:50:55 +0100 Subject: [PATCH] libxl+xend: use correct paths for PV console when running bootloader Makes "{xl,xm} create -c GUEST" work again with pygrub in interactive mode which was broken by 21994:2e08ec0028e4 Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Signed-off-by: Ian Jackson --- tools/libxl/libxl_bootloader.c | 2 +- tools/python/xen/util/diagnose.py | 2 +- tools/python/xen/xend/XendBootloader.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 13721f7fab..d96db5b2e1 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -383,7 +383,7 @@ int libxl_run_bootloader(libxl_ctx *ctx, goto out_close; } - dom_console_xs_path = libxl_sprintf(&gc, "%s/serial/0/tty", libxl_xs_get_dompath(&gc, domid)); + dom_console_xs_path = libxl_sprintf(&gc, "%s/console/tty", libxl_xs_get_dompath(&gc, domid)); libxl_xs_write(&gc, XBT_NULL, dom_console_xs_path, "%s", dom_console_slave_tty_path); pid = fork_exec_bootloader(&bootloader_fd, (char *)info->u.pv.bootloader, args); diff --git a/tools/python/xen/util/diagnose.py b/tools/python/xen/util/diagnose.py index b857e2d740..e31f396e73 100644 --- a/tools/python/xen/util/diagnose.py +++ b/tools/python/xen/util/diagnose.py @@ -77,7 +77,7 @@ def diagnose(dom): def diagnose_console(): port = xstransact.Read(dompath + '/console/port') ringref = xstransact.Read(dompath + '/console/ring-ref') - tty = xstransact.Read(dompath + '/serial/0/tty') + tty = xstransact.Read(dompath + '/console/tty') if not port: print "Console port is missing; Xend has failed." diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py index 0cef917358..74c9a2ac19 100644 --- a/tools/python/xen/xend/XendBootloader.py +++ b/tools/python/xen/xend/XendBootloader.py @@ -85,7 +85,7 @@ def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '', fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY) slavename = ptsname.ptsname(m1) - dom.storeDom("serial/0/tty", slavename) + dom.storeDom("console/tty", slavename) # Release the domain lock here, because we definitely don't want # a stuck bootloader to deny service to other xend clients. -- 2.30.2